Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 20:39:11 +0000 (13:39 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 14 Jul 2011 20:39:11 +0000 (13:39 -0700)

Trivial merge